Re-factor definition of TZC-400 base address

This patch replaces the `ARM_TZC_BASE` constant with `PLAT_ARM_TZC_BASE` to
support different TrustZone Controller base addresses across ARM platforms.

Change-Id: Ie4e1c7600fd7a5875323c7cc35e067de0c6ef6dd

diff --git a/include/plat/arm/common/arm_def.h b/include/plat/arm/common/arm_def.h
index 377bfaa222700f781de349881375f0ec04937339..a22e64ab344f589a92e685d98edd8384f5c89c17 100644 (file)
--- a/include/plat/arm/common/arm_def.h
+++ b/include/plat/arm/common/arm_def.h
@@ -173,10 +173,6 @@
 
 #define ARM_CONSOLE_BAUDRATE           115200
 
-/* TZC related constants */
-#define ARM_TZC_BASE                   0x2a4a0000
-
-
 /******************************************************************************
  * Required platform porting definitions common to all ARM standard platforms
  *****************************************************************************/

diff --git a/include/plat/arm/css/common/css_def.h b/include/plat/arm/css/common/css_def.h
index 157a22f4c926720918e5361c2b63d081514db090..e5005b9a60a359ef5e4900d0468ab353f5446fc7 100644 (file)
--- a/include/plat/arm/css/common/css_def.h
+++ b/include/plat/arm/css/common/css_def.h
@@ -111,6 +111,6 @@
 
 /* TZC related constants */
 #define PLAT_ARM_TZC_FILTERS           REG_ATTR_FILTER_BIT_ALL
-
+#define PLAT_ARM_TZC_BASE              0x2a4a0000
 
 #endif /* __CSS_DEF_H__ */

diff --git a/plat/arm/board/fvp/include/platform_def.h b/plat/arm/board/fvp/include/platform_def.h
index c2a7d6a567073ec66799a58fa9f4e6ed1d6afa2a..9f42fd26f68520c20f03870e7a6e3bddc8bc69ff 100644 (file)
--- a/plat/arm/board/fvp/include/platform_def.h
+++ b/plat/arm/board/fvp/include/platform_def.h
@@ -100,6 +100,7 @@
  * Give access to the CPUs and Virtio. Some devices
  * would normally use the default ID so allow that too.
  */
+#define PLAT_ARM_TZC_BASE              0x2a4a0000
 #define PLAT_ARM_TZC_FILTERS           REG_ATTR_FILTER_BIT(0)
 
 #define PLAT_ARM_TZC_NS_DEV_ACCESS     (                               \

diff --git a/plat/arm/common/arm_security.c b/plat/arm/common/arm_security.c
index 8bee4fef8909f2f313595e68c8433f6a63f5712f..990d8d4a6edc2ae5c1f5102f51c81521ab3fe05c 100644 (file)
--- a/plat/arm/common/arm_security.c
+++ b/plat/arm/common/arm_security.c
@@ -47,7 +47,7 @@ void arm_tzc_setup(void)
 {
        INFO("Configuring TrustZone Controller\n");
 
-       tzc_init(ARM_TZC_BASE);
+       tzc_init(PLAT_ARM_TZC_BASE);
 
        /* Disable filters. */
        tzc_disable_filters();